Patch from Juan Pablo Mendoza Mendoza to fix things so clicking inside

Thu May  3 07:00:09 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextview.c: Patch from Juan Pablo Mendoza Mendoza
	to fix things so clicking inside selection leaves cursor
	at point where clicked. (#50324)

	* gtk/gtksettings.c (gtk_settings_class_init): Restore
	sane value for default double click time.

	* tests/testtext.c (test_init): Really path to input modules.

diff --git a/ChangeLog b/ChangeLog
index 47173159c9d61df61dcc9c84c7e9c9e9f8286054..d47a725c10605429e7fce3c6302f9335dcb365c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu May  3 07:00:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c: Patch from Juan Pablo Mendoza Mendoza
+       to fix things so clicking inside selection leaves cursor
+       at point where clicked. (#50324)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Restore
+       sane value for default double click time.
+
+       * tests/testtext.c (test_init): Really path to input modules.
+
 2001-05-03  Sven Neumann  <sven@convergence.de>
 
        * demos/testpixbuf-save.c: include target-specific headers as

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 47173159c9d61df61dcc9c84c7e9c9e9f8286054..d47a725c10605429e7fce3c6302f9335dcb365c5 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Thu May  3 07:00:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c: Patch from Juan Pablo Mendoza Mendoza
+       to fix things so clicking inside selection leaves cursor
+       at point where clicked. (#50324)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Restore
+       sane value for default double click time.
+
+       * tests/testtext.c (test_init): Really path to input modules.
+
 2001-05-03  Sven Neumann  <sven@convergence.de>
 
        * demos/testpixbuf-save.c: include target-specific headers as

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 47173159c9d61df61dcc9c84c7e9c9e9f8286054..d47a725c10605429e7fce3c6302f9335dcb365c5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Thu May  3 07:00:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c: Patch from Juan Pablo Mendoza Mendoza
+       to fix things so clicking inside selection leaves cursor
+       at point where clicked. (#50324)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Restore
+       sane value for default double click time.
+
+       * tests/testtext.c (test_init): Really path to input modules.
+
 2001-05-03  Sven Neumann  <sven@convergence.de>
 
        * demos/testpixbuf-save.c: include target-specific headers as

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 47173159c9d61df61dcc9c84c7e9c9e9f8286054..d47a725c10605429e7fce3c6302f9335dcb365c5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Thu May  3 07:00:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c: Patch from Juan Pablo Mendoza Mendoza
+       to fix things so clicking inside selection leaves cursor
+       at point where clicked. (#50324)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Restore
+       sane value for default double click time.
+
+       * tests/testtext.c (test_init): Really path to input modules.
+
 2001-05-03  Sven Neumann  <sven@convergence.de>
 
        * demos/testpixbuf-save.c: include target-specific headers as

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 47173159c9d61df61dcc9c84c7e9c9e9f8286054..d47a725c10605429e7fce3c6302f9335dcb365c5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Thu May  3 07:00:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c: Patch from Juan Pablo Mendoza Mendoza
+       to fix things so clicking inside selection leaves cursor
+       at point where clicked. (#50324)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Restore
+       sane value for default double click time.
+
+       * tests/testtext.c (test_init): Really path to input modules.
+
 2001-05-03  Sven Neumann  <sven@convergence.de>
 
        * demos/testpixbuf-save.c: include target-specific headers as

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 47173159c9d61df61dcc9c84c7e9c9e9f8286054..d47a725c10605429e7fce3c6302f9335dcb365c5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Thu May  3 07:00:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c: Patch from Juan Pablo Mendoza Mendoza
+       to fix things so clicking inside selection leaves cursor
+       at point where clicked. (#50324)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Restore
+       sane value for default double click time.
+
+       * tests/testtext.c (test_init): Really path to input modules.
+
 2001-05-03  Sven Neumann  <sven@convergence.de>
 
        * demos/testpixbuf-save.c: include target-specific headers as

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 47173159c9d61df61dcc9c84c7e9c9e9f8286054..d47a725c10605429e7fce3c6302f9335dcb365c5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Thu May  3 07:00:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c: Patch from Juan Pablo Mendoza Mendoza
+       to fix things so clicking inside selection leaves cursor
+       at point where clicked. (#50324)
+
+       * gtk/gtksettings.c (gtk_settings_class_init): Restore
+       sane value for default double click time.
+
+       * tests/testtext.c (test_init): Really path to input modules.
+
 2001-05-03  Sven Neumann  <sven@convergence.de>
 
        * demos/testpixbuf-save.c: include target-specific headers as

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 8c329212e05c8403074e148dd9414ac917167ec3..214bdcc3052e962de016efeacd0189494ec2fc56 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -129,7 +129,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                              g_param_spec_int ("gtk-double-click-timeout",
                                                                _("Double Click Timeout"),
                                                                _("Maximum time allowed between two clicks for them to be considered a double click"),
-                                                               0, G_MAXINT, 1000,
+                                                               0, G_MAXINT, 250,
                                                                G_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_DOUBLE_CLICK_TIMEOUT);

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 2b72204e7de06ecd26606382535081c3abe86660..26aa7c698002bec2dc7be9a699230ec326fd106b 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -3163,10 +3163,18 @@ gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event)
         }
       else
         {
+         GtkTextIter iter;
+
           /* Unselect everything; probably we were dragging, or clicked
-           * outside the text.
+           * without dragging to remove selection.
            */
-          gtk_text_view_unselect (text_view);
+         gtk_text_layout_get_iter_at_pixel (text_view->layout,
+                                            &iter,
+                                            event->x + text_view->xoffset,
+                                            event->y + text_view->yoffset);
+
+         gtk_text_buffer_place_cursor (get_buffer (text_view), &iter);
+  
           return FALSE;
         }
     }

diff --git a/tests/testtext.c b/tests/testtext.c
index 530842f68a130292e5dc7f871acd08d2ac25200a..a473837cda3b751d073202a8c2a49ce76accd18a 100644 (file)
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -2234,7 +2234,7 @@ test_init ()
   if (file_exists ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so"))
     {
       putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
-      putenv ("GTK_IM_MODULE_FILE=../gtk/gtk.immodules");
+      putenv ("GTK_IM_MODULE_FILE=../modules/input/gtk.immodules");
     }
 }